Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 14 Mar 2012 05:54:12 +0000 (22:54 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 14 Mar 2012 05:54:12 +0000 (22:54 -0700)

Trivial merge